From 0495f6eb855f96b709bb32bebf2444d4263deef9 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Fri, 23 Jun 2006 15:12:10 -0600 Subject: [PATCH] [IA64] memory exchange: ia64 counter part of cs 10353 xen-unstable.hg IA64 counter part of the change set 10353:bd1a0b2bb2d4596227951ad6d36cb4fcc2d00a8e of xen-unstable.hg Only destroy a machine-contiguous memory region if it really is contiguous. Signed-off-by: Isaku Yamahata --- linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c index a406273513..150e54e7d7 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c @@ -275,6 +275,9 @@ __xen_destroy_contiguous_region(unsigned long vstart, unsigned int order) struct xen_memory_reservation reservation; unsigned long i; + if (!test_bit(start_gpfn, contiguous_bitmap)) + return; + gpfns = kmalloc(sizeof(gpfns[0]) * num_gpfn, GFP_KERNEL | __GFP_NOFAIL); for (i = 0; i < num_gpfn; i++) { -- 2.30.2